testsuite: Check errors not just for line, but for full range
authorBenjamin Otte <otte@redhat.com>
Thu, 11 Apr 2019 02:33:08 +0000 (04:33 +0200)
committerBenjamin Otte <otte@redhat.com>
Fri, 12 Apr 2019 17:34:29 +0000 (19:34 +0200)
Instead of just checking that the line of the error message is correct,
assert that start and end position are on the correct character offset.

Also fix all the tests to conform to this.

97 files changed:
testsuite/css/parser/animation-crash-3.12.errors
testsuite/css/parser/at-invalid-01.errors
testsuite/css/parser/at-invalid-02.errors
testsuite/css/parser/at-invalid-03.errors
testsuite/css/parser/at-invalid-04.errors
testsuite/css/parser/at-invalid-05.errors
testsuite/css/parser/at-invalid-06.errors
testsuite/css/parser/at-invalid-07.errors
testsuite/css/parser/at-invalid-08.errors
testsuite/css/parser/at-invalid-09.errors
testsuite/css/parser/at-invalid-10.errors
testsuite/css/parser/at-invalid-11.errors
testsuite/css/parser/at-invalid-12.errors
testsuite/css/parser/at-invalid-13.errors
testsuite/css/parser/at-invalid-14.errors
testsuite/css/parser/at-invalid-15.errors
testsuite/css/parser/at-invalid-16.errors
testsuite/css/parser/at-invalid-17.errors
testsuite/css/parser/at-invalid-18.errors
testsuite/css/parser/at-invalid-19.errors
testsuite/css/parser/at-invalid-20.errors
testsuite/css/parser/at-invalid-21.errors
testsuite/css/parser/at-invalid-22.css [new file with mode: 0644]
testsuite/css/parser/at-invalid-22.errors [new file with mode: 0644]
testsuite/css/parser/at-invalid-22.ref.css [new file with mode: 0644]
testsuite/css/parser/at-valid-11.css
testsuite/css/parser/at-valid-16.css
testsuite/css/parser/background-position-errors.errors
testsuite/css/parser/background-position.errors
testsuite/css/parser/background-position.ref.css
testsuite/css/parser/border-infloop-3.12.errors
testsuite/css/parser/border-radius-shorthand.errors
testsuite/css/parser/border.errors
testsuite/css/parser/calc-errors.css
testsuite/css/parser/calc-errors.errors
testsuite/css/parser/calc-errors.ref.css
testsuite/css/parser/calc.css
testsuite/css/parser/calc.ref.css
testsuite/css/parser/close-at-end-of-file.errors
testsuite/css/parser/colors-errors.css
testsuite/css/parser/colors-errors.errors
testsuite/css/parser/colors-errors.ref.css
testsuite/css/parser/colors-red.css
testsuite/css/parser/colors-red.ref.css
testsuite/css/parser/css-21-malformed-declarations.css
testsuite/css/parser/css-21-malformed-declarations.errors
testsuite/css/parser/css-21-malformed-declarations.ref.css
testsuite/css/parser/css-21-malformed-statements.errors
testsuite/css/parser/declarations-invalid-01.errors
testsuite/css/parser/declarations-invalid-02.errors
testsuite/css/parser/declarations-invalid-03.errors
testsuite/css/parser/declarations-invalid-04.errors
testsuite/css/parser/declarations-invalid-05.errors
testsuite/css/parser/declarations-invalid-06.errors
testsuite/css/parser/declarations-invalid-07.errors
testsuite/css/parser/declarations-invalid-08.errors
testsuite/css/parser/declarations-valid-02.errors [new file with mode: 0644]
testsuite/css/parser/declarations-valid-04.css
testsuite/css/parser/declarations-valid-05.css
testsuite/css/parser/declarations-valid-08.css
testsuite/css/parser/declarations-valid-09.css
testsuite/css/parser/declarations-valid-10.css
testsuite/css/parser/declarations-valid-11.css
testsuite/css/parser/declarations-valid-12.css
testsuite/css/parser/declarations-valid-13.css
testsuite/css/parser/declarations-valid-14.css
testsuite/css/parser/declarations-valid-15.css
testsuite/css/parser/declarations-valid-16.css
testsuite/css/parser/declarations-valid-17.css
testsuite/css/parser/declarations-valid-18.css
testsuite/css/parser/declarations-valid-22.css
testsuite/css/parser/declarations-valid-23.css
testsuite/css/parser/declarations-valid-24.css
testsuite/css/parser/declarations-valid-25.css
testsuite/css/parser/declarations-valid-26.css
testsuite/css/parser/declarations.errors
testsuite/css/parser/does-not-exist.errors
testsuite/css/parser/freed-string-in-error-messages.errors
testsuite/css/parser/import-cyclic-1.css
testsuite/css/parser/import-cyclic-1.errors
testsuite/css/parser/import-cyclic-2.css
testsuite/css/parser/import-cyclic-2.errors
testsuite/css/parser/import-cyclic-3.css
testsuite/css/parser/import-cyclic-3.errors
testsuite/css/parser/import-nonexistant.errors
testsuite/css/parser/import-recursive.errors
testsuite/css/parser/meson.build
testsuite/css/parser/no-semicolon.errors [new file with mode: 0644]
testsuite/css/parser/nth-child.css
testsuite/css/parser/property-name-errors.errors
testsuite/css/parser/pseudo-classes-unknown.errors
testsuite/css/parser/radial-background-position-error.errors
testsuite/css/parser/radial-positions.errors
testsuite/css/parser/single-slash.errors
testsuite/css/parser/test-css-parser.c
testsuite/css/parser/text-shadow-invalid-but-worked-in-3.12.errors
testsuite/css/parser/value-none.errors

index 035482eba3e2ffacdca801ae1a00103e70362f99..065d6d311b7b7b72140ca2f52c64801f5a018aa7 100644 (file)
@@ -1 +1 @@
-animation-crash-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+animation-crash-3.12.css:2:14-18: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 2c54e9ec9d2c24d341118c1b682801b2cc4acd23..851910659d2c8ed5854eb60d3d4ddb2f09db2da8 100644 (file)
@@ -1 +1 @@
-at-invalid-01.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-01.css:1:9-10: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 61307e3916d19c9036aaafc4efc7125159588635..a0cf0f4488260cb089c57018f96bd4e3daab6be5 100644 (file)
@@ -1 +1 @@
-at-invalid-02.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-02.css:1:9-12: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 5e9575f53af6dfb869f82eceac5d70a388d3dd5d..ababc4e9b95025aa29886664b50edc2048ab213b 100644 (file)
@@ -1 +1,3 @@
-at-invalid-03.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-03.css:1:13-16: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-03.css:1:9-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
+at-invalid-03.css:1:1-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
index c879cb35b6b95583de7174f2956073450a91b46e..f3470e135a95488fe09cafd986d0edce5f14b37c 100644 (file)
@@ -1 +1,3 @@
-at-invalid-04.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-04.css:1:13-16: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-04.css:1:9-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
+at-invalid-04.css:1:1-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
index 6b606facada60b59a14207f47fb64fc20f055e28..eaeb390ddbe6ab8f94b1c31f9521efcb3dc74a98 100644 (file)
@@ -1 +1,3 @@
-at-invalid-05.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-05.css:1:13-20: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-05.css:1:9-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
+at-invalid-05.css:1:1-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
index fbc5ecccdab9c52cd9cc69a55891359b39986b9c..781883c94100cf517582d6fd16b37b4afd3dbeb0 100644 (file)
@@ -1 +1 @@
-at-invalid-06.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-06.css:1:1-2: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 5abb2181b71e2fcdf545c1fa9d50421b934c69f4..bcf101f658a99f8637b5beff0d23349d8ac674b6 100644 (file)
@@ -1 +1 @@
-at-invalid-07.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-07.css:1:1-14: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 76d8e062101ddf029a0aae242f3b4be185162beb..723db934c9d0a53dd51a1548d1acca74f1d436e9 100644 (file)
@@ -1 +1 @@
-at-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-08.css:1:20-26: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
index 73cafa37293c8e66216d43331ba0257965936455..22151b571c0e088d393c6b1f0f34d1eb1759640c 100644 (file)
@@ -1 +1 @@
-at-invalid-09.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-09.css:1:20-27: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
index 1b70899ac14bca78de6026156c40caa90f73891d..274eb1bd6205da6adfd1e6ff633b12c1343da36a 100644 (file)
@@ -1 +1 @@
-at-invalid-10.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-10.css:1:20-21: error: GTK_CSS_PARSER_ERROR_SYNTAX
index d5a5d2a65b5d433d805545265d80ee7f6edbd461..4740c0599d10fabc84d2759bbb2a418a29ea3a47 100644 (file)
@@ -1 +1 @@
-at-invalid-11.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-11.css:1:20-21: error: GTK_CSS_PARSER_ERROR_SYNTAX
index d402333d1edb7bacba066ef5243906eb13bf8131..7567285ad9fdd9456a9562656b4ce70452792031 100644 (file)
@@ -1 +1 @@
-at-invalid-12.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-12.css:1:38-44: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 1cc20eb60e20aaebb5577a5bec3d281f422fcbe1..6bb9d72acd8d341f868d1b8bc0e1656b9485c2ee 100644 (file)
@@ -1 +1 @@
-at-invalid-13.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-13.css:1:32-35: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 5ea3d4325013103324697999af898ce922208321..dcbdd47c66eb8548c918c20572dad2238b2b6ade 100644 (file)
@@ -1 +1 @@
-at-invalid-14.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-14.css:1:25-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 20c82221600562d811890bc14dfb22daef91d232..6015a37a6e5b0b1f7e4e5ce9ac78791485e204e5 100644 (file)
@@ -1 +1 @@
-at-invalid-15.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-15.css:1:36-37: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 36beecee49dfd0913e5b7fcb69049b05a6e47b23..01566b922fc77ff304a3a408fdcc73e22c4d551d 100644 (file)
@@ -1 +1 @@
-at-invalid-16.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-16.css:1:30-31: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 15c00b2f4af96e6d49217e9ad9906de66943cc6f..dfc18a31fc3693ea8a37f66a99e521dde0e94518 100644 (file)
@@ -1 +1 @@
-at-invalid-17.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-17.css:1:25-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 7e39962835c6274286ea6433fde914314dd3f04c..f412bd2385ff1ee7d5ac1db1fd2e78b7ddd07cef 100644 (file)
@@ -1 +1 @@
-at-invalid-18.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-18.css:1:39-40: error: GTK_CSS_PARSER_ERROR_SYNTAX
index d58b5aeef7936d695f0f1c1757544c5d233feb6a..ac15f1b27c09533e7565c3b5798b5e6149e40403 100644 (file)
@@ -1 +1 @@
-at-invalid-19.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-19.css:1:30-31: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 533f9f6142ae2d9047f57067c94951bc5dcef540..836e7cb53fa3935cf4bb21cb11f1f5c1545e6024 100644 (file)
@@ -1 +1 @@
-at-invalid-20.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-20.css:1:15-19: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 2a18d02336bc5632ea0d17f703e2ceec6dc96cc9..a9f94125e08dc759c1f75519c987c0b666397527 100644 (file)
@@ -1,2 +1,2 @@
-at-invalid-21.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
-at-invalid-21.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-21.css:1:1-11: error: GTK_CSS_PARSER_ERROR_SYNTAX
+at-invalid-21.css:1:31-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
diff --git a/testsuite/css/parser/at-invalid-22.css b/testsuite/css/parser/at-invalid-22.css
new file mode 100644 (file)
index 0000000..db96269
--- /dev/null
@@ -0,0 +1 @@
+@define-color color darker ( @blue ) ;
diff --git a/testsuite/css/parser/at-invalid-22.errors b/testsuite/css/parser/at-invalid-22.errors
new file mode 100644 (file)
index 0000000..168e43d
--- /dev/null
@@ -0,0 +1 @@
+at-invalid-22.css:1:21-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
diff --git a/testsuite/css/parser/at-invalid-22.ref.css b/testsuite/css/parser/at-invalid-22.ref.css
new file mode 100644 (file)
index 0000000..e69de29
index db9626914a64f5e08852cb13a0b11489d0673ad9..5d6883fd36b3071beb64ba4d7d87140fbfcf6494 100644 (file)
@@ -1 +1 @@
-@define-color color darker ( @blue ) ;
+@define-color color darker( @blue ) ;
index cc36511c6dc6b3569df55d732f2a295b007d990b..8004be020157aba282d0fd68458578efa46bd8fc 100644 (file)
@@ -1 +1 @@
-@define-color color mix(shade (#121212, 0.5), mix (rgb(10%,20%,100%), @blue,0.5), 0.2);
+@define-color color mix(shade(#121212, 0.5), mix(rgb(10%,20%,100%), @blue,0.5), 0.2);
index de4b227414f8ac7816f3d2706f370e3c73fc71a3..5d198850a1c0cf0da153d9742ec4f738caf5cdd0 100644 (file)
@@ -1 +1 @@
-background-position-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position-errors.css:2:24-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 8a3e2c2b7ca658b8c6ce17d91a4a43ed0bf9bda4..2446e876b53e3af121ca04a3d950a7770011d3e0 100644 (file)
@@ -1,14 +1,12 @@
-background-position.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:66: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:70: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:90: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:102: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:110: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:122: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:126: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:150: error: GTK_CSS_PARSER_ERROR_SYNTAX
-background-position.css:154: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:6:28-31: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:18:28-34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:26:28-31: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:38:29-33: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:42:29-34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:66:30-34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:70:30-35: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:90:31-34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:102:31-37: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:110:31-34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:150:28-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+background-position.css:154:28-33: error: GTK_CSS_PARSER_ERROR_SYNTAX
index a496921b929d78e38ec7ff44713580551dfd47e3..8c7afc18f96d4d05fe2238c3d641a0abe7958c90 100644 (file)
@@ -109,9 +109,11 @@ db {
 }
 
 eb {
+  background-position: left;
 }
 
 fb {
+  background-position: right;
 }
 
 gb {
index 12870eb619bc438be97eddb16009aa62c8b183a3..180a2d558c51964dcc04d3ec33b01ce397bbd24b 100644 (file)
@@ -1 +1 @@
-border-infloop-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-infloop-3.12.css:2:25-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 55d3b8c184956635ce20d390cc011c0cf363e571..8b0ebf376e37f83545870dd350f5bd2a0ce85aae 100644 (file)
@@ -1,13 +1,13 @@
-border-radius-shorthand.css:64: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:68: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:72: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:76: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:80: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:84: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:88: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:92: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:96: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:100: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:104: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:108: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border-radius-shorthand.css:112: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:64:18-22: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:68:22-26: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:72:26-30: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:76:30-34: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:80:36-40: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:84:40-44: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:88:44-48: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:92:48-52: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border-radius-shorthand.css:96:18-19: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:100:18-19: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:104:23-24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:108:34-37: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border-radius-shorthand.css:112:44-47: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 86d0d2a1ee914d61ce3fcc61b169a649fc84b3d6..24b36bfff1c8aab1ae18c754912478e6dae5ab82 100644 (file)
@@ -1,8 +1,8 @@
-border.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX
-border.css:54: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:26:25-29: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:30:23-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:34:23-25: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border.css:38:23-27: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+border.css:42:23-29: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:46:29-35: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:50:31-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+border.css:54:29-30: error: GTK_CSS_PARSER_ERROR_SYNTAX
index b1464c30cbc7bb0eced18ab0f584408c3e22c601..592e1a3954b8220e7a7a33d3e230445600f684df 100644 (file)
@@ -1,7 +1,3 @@
-a {
-  margin-left: calc(calc(1px));
-}
-
 b {
   margin-left: calc(1px + 2s);
 }
@@ -59,7 +55,7 @@ o {
 }
 
 p {
-  margin-left: calc((((((1px))));
+  margin-left: calc((((((1px))));));
 }
 
 q {
@@ -73,3 +69,7 @@ r {
 s {
   margin-left: calc(1px + (error));
 }
+
+t {
+  margin-left: calc((3px + 4px and a lot of junk));
+}
index db05431565f356bdc9657dbc5c1d1e63e1b2a921..da60d5d6557364ce57b3399722fd3d2fb3bbb92a 100644 (file)
@@ -1,19 +1,19 @@
-calc-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:54: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:58: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:62: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:66: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:70: error: GTK_CSS_PARSER_ERROR_SYNTAX
-calc-errors.css:74: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:2:27-29: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:6:27-29: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:10:21-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:14:27-30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:18:25-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:22:21-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:26:27-30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:30:21-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:34:27-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:38:27-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:42:25-30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:46:25-30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:50:27-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:54:27-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:58:33-34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:62:35-36: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:66:27-30: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:70:28-33: error: GTK_CSS_PARSER_ERROR_SYNTAX
+calc-errors.css:74:32-49: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 3966afd5191ae929f9b641b56081717ef42b98d4..f7df1f634b1f2e29c8c8d47b49f27950c0b76579 100644 (file)
@@ -1,6 +1,3 @@
-a {
-}
-
 b {
 }
 
@@ -54,3 +51,6 @@ r {
 
 s {
 }
+
+t {
+}
index cc511fa7de82e28452e3538621d77d6fcc54bec5..0c07d7234d69dfb969d7f236132a0f52f70d52c5 100644 (file)
@@ -37,3 +37,7 @@ i {
 j {
   border-bottom-right-radius: calc((1 + 1 + (1 + 1) + 1) * 1px) calc((1 / 1) * 1px);
 }
+
+k {
+  margin-left: calc(calc(1px));
+}
index cc2ca59d82455b5cb3a4f94b0ba74b8809c5d73b..eb368355529aa84cf62bc05ffe40a27cce5a9e70 100644 (file)
@@ -37,3 +37,7 @@ i {
 j {
   border-bottom-right-radius: 5px 1px;
 }
+
+k {
+  margin-left: 1px;
+}
index 34159058df0b7dd04c634e08a50e8e64971f3f53..77028593ef6ff9719ccb2cdaf72ae22c4c0f9cda 100644 (file)
@@ -1 +1,2 @@
-close-at-end-of-file.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
+close-at-end-of-file.css:2:3-3:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
+close-at-end-of-file.css:1:5-3:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
index 4f7f3f938de7c0209496afa8e871d1cdca0363af..df9de80a0f89fb633d55d1042da70e165e994638 100644 (file)
@@ -25,3 +25,8 @@ f {
 g {
   color: rgba(1,2,3,4,5);
 }
+
+h {
+  color: rgb(100%,0,0);
+}
+
index 506c0b3ec4aed7880639489e153493de29241bb8..b52d0256cf78373792af2e83a7f1cb6469b2d580 100644 (file)
@@ -1,7 +1,8 @@
-colors-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
-colors-errors.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
-colors-errors.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
-colors-errors.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
-colors-errors.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
-colors-errors.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
-colors-errors.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:2:10-12: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+colors-errors.css:6:10-13: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+colors-errors.css:10:10-16: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+colors-errors.css:14:10-18: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+colors-errors.css:18:10-23: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:22:19-20: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:26:22-23: error: GTK_CSS_PARSER_ERROR_SYNTAX
+colors-errors.css:30:19-20: error: GTK_CSS_PARSER_ERROR_SYNTAX
index e458bcfc14e7e1c221017cf6bcbe88ce084bf87d..cfb1eff431767ef918dd3a8b2afd76689b2afda7 100644 (file)
@@ -18,3 +18,6 @@ f {
 
 g {
 }
+
+h {
+}
index ed69db63321b7d631a9f6fe38fe147e3487c0e26..13d75908ddb73c3c4a2d12f36a82667cf7a709cf 100644 (file)
@@ -14,10 +14,6 @@ d {
   color: rgba(100%,0%,0%,1);
 }
 
-e {
-  color: rgb(100%,0,0);
-}
-
 f {
   color: #f00;
 }
index f8e68c1a68c340856dd2acc099da8b386b141038..ce6c42f623f317f108fc3a454b5f5e9ff8ead152 100644 (file)
@@ -14,10 +14,6 @@ d {
   color: rgb(255,0,0);
 }
 
-e {
-  color: rgb(255,0,0);
-}
-
 f {
   color: rgb(255,0,0);
 }
index 7ea0cc6b6e1f5f9091b80b4b69a8b2a23acdd9ee..9bfbd0a3cc75851d09ec61429b51435d36232bd4 100644 (file)
@@ -1,7 +1,7 @@
-p { color:green }
-p { color:green; color }  /* malformed declaration missing ':', value */
-p { color:red;   color; color:green }  /* same with expected recovery */
-p { color:green; color: } /* malformed declaration missing value */
-p { color:red;   color:; color:green } /* same with expected recovery */
-p { color:green; color{;color:maroon} } /* unexpected tokens { } */
-p { color:red;   color{;color:maroon}; color:green } /* same with recovery */
+a { color:green }
+b { color:green; color }  /* malformed declaration missing ':', value */
+c { color:red;   color; color:green }  /* same with expected recovery */
+d { color:green; color: } /* malformed declaration missing value */
+e { color:red;   color:; color:green } /* same with expected recovery */
+f { color:green; color{;color:maroon} } /* unexpected tokens { } */
+g { color:red;   color{;color:maroon}; color:green } /* same with recovery */
index 128b52e2ceb3f2a28641ad4dd39931b73a479b96..b3eb929f91439e0e79cef73ed38788ff0cf14e6f 100644 (file)
@@ -1,6 +1,13 @@
-css-21-malformed-declarations.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-declarations.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-declarations.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-declarations.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-declarations.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-declarations.css:7: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:1:5-17: error: GTK_CSS_PARSER_WARNING_SYNTAX
+css-21-malformed-declarations.css:2:24-25: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:2:18-24: error: GTK_CSS_PARSER_WARNING_SYNTAX
+css-21-malformed-declarations.css:3:23-24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:3:25-37: error: GTK_CSS_PARSER_WARNING_SYNTAX
+css-21-malformed-declarations.css:4:25-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:4:18-25: error: GTK_CSS_PARSER_WARNING_SYNTAX
+css-21-malformed-declarations.css:5:24-25: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:5:26-38: error: GTK_CSS_PARSER_WARNING_SYNTAX
+css-21-malformed-declarations.css:6:23-24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:6:18-39: error: GTK_CSS_PARSER_WARNING_SYNTAX
+css-21-malformed-declarations.css:7:23-24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-declarations.css:7:40-52: error: GTK_CSS_PARSER_WARNING_SYNTAX
index f83e6791679eef4ad58aa9e2c35d968bf3adc083..deda94795593b3738a727a95131939a8a4b15251 100644 (file)
@@ -1,27 +1,27 @@
-p {
+a {
   color: rgb(0,128,0);
 }
 
-p {
+b {
   color: rgb(0,128,0);
 }
 
-p {
+c {
   color: rgb(0,128,0);
 }
 
-p {
+d {
   color: rgb(0,128,0);
 }
 
-p {
+e {
   color: rgb(0,128,0);
 }
 
-p {
+f {
   color: rgb(0,128,0);
 }
 
-p {
+g {
   color: rgb(0,128,0);
 }
index 23b3b4b23a6f785f257a02b5900d03f50b4be2a3..a06d48d89b73cdc5fefa9bce5d0df7f4eab50652 100644 (file)
@@ -1,4 +1,4 @@
-css-21-malformed-statements.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-statements.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-statements.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
-css-21-malformed-statements.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-statements.css:1:3-8: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-statements.css:2:1-5: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-statements.css:3:1-2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+css-21-malformed-statements.css:4:1-2: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 4114795b359039cf25f31580bf7b354093e0858c..fde89fed675c7fdcb6e965eb6886d6883aac3bdc 100644 (file)
@@ -1 +1,2 @@
-declarations-invalid-01.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-01.css:1:11-12: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-01.css:1:5-11: error: GTK_CSS_PARSER_WARNING_SYNTAX
index b267550163c057010b6d32820eed077eb7077af4..41caa3f86b8b77413958879c5a66876d225c9738 100644 (file)
@@ -1 +1,2 @@
-declarations-invalid-02.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-02.css:1:24-25: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-02.css:1:18-24: error: GTK_CSS_PARSER_WARNING_SYNTAX
index d804db4eb8a1ceb598a8ae0d1a79be0aabec57ef..0298d5cfaf078ea5aa6b95451bd18c9b66526cae 100644 (file)
@@ -1 +1,2 @@
-declarations-invalid-03.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-03.css:1:21-22: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-03.css:1:23-35: error: GTK_CSS_PARSER_WARNING_SYNTAX
index de0de60ddb68e8fcab278d405868c5dee3a9b8ca..10ad66699792961c591eeff08bbbb966748fface 100644 (file)
@@ -1 +1,2 @@
-declarations-invalid-04.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-04.css:1:25-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-04.css:1:18-25: error: GTK_CSS_PARSER_WARNING_SYNTAX
index 061e4b27b30e6fef6f80e55ac22d06e8a946419d..e67bf467ade62b83dbfcbfdbf2fca217c3c55ceb 100644 (file)
@@ -1 +1,2 @@
-declarations-invalid-05.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-05.css:1:22-23: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-05.css:1:24-36: error: GTK_CSS_PARSER_WARNING_SYNTAX
index a10b6d26ad3b88c527ed5116b8fb914cd2306b8c..fc1a0e077cd070e059ba3470aa2cbd295da4f290 100644 (file)
@@ -1 +1,2 @@
-declarations-invalid-06.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-06.css:1:23-24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-06.css:1:18-39: error: GTK_CSS_PARSER_WARNING_SYNTAX
index 43112526948d41883499a5a02f361540ec57c636..2eb16e1921589512998e10eb2af9bc916bef563f 100644 (file)
@@ -1 +1,2 @@
-declarations-invalid-07.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-07.css:1:21-22: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-07.css:1:38-50: error: GTK_CSS_PARSER_WARNING_SYNTAX
index de507ef742494bb8ce9a15f55faa3a2952c43484..fc5021249488fd68f875e1812038202a353d8ec3 100644 (file)
@@ -1,3 +1,3 @@
-declarations-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations-invalid-08.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations-invalid-08.css:1:5-12: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+declarations-invalid-08.css:1:5-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations-invalid-08.css:1:3-2:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
diff --git a/testsuite/css/parser/declarations-valid-02.errors b/testsuite/css/parser/declarations-valid-02.errors
new file mode 100644 (file)
index 0000000..98b1d42
--- /dev/null
@@ -0,0 +1 @@
+declarations-valid-02.css:1:5-21: error: GTK_CSS_PARSER_WARNING_SYNTAX
index 630d941455b5a8bfcd0e430859115043ad3a99ca..8a1a0969acd166a217566d9dbf200acdc42d1e70 100644 (file)
@@ -1 +1 @@
-* { font: bold 15px sans }
+* { font: bold 15px sans ;}
index c3997d3a2758048fb7aaf88076d1f42e55d36ce0..b05777025e90df851638c7f7e72ccc08a69ccd30 100644 (file)
@@ -1 +1 @@
-* { color: red }
+* { color: red; }
index a89205d44ebda28bbff613f12f15b7690ba43930..280e9f7f8f4cdb347ac7c300d634e4b58592a33b 100644 (file)
@@ -1 +1 @@
-* { font: /* comment here */ 15px Sans }
+* { font: /* comment here */ 15px Sans; }
index 88530f0b90e59cc2509a03c6567357e6bfb52998..667c6b404cad7c1e1320a842d48ca3c293e50b85 100644 (file)
@@ -1 +1 @@
-* { color: red; background-color: shade (@bg_color, 0.5) }
+* { color: red; background-color: shade(@bg_color, 0.5); }
index 8ecb71163358f2f5b2fe809f25cb8bb6446c1c9a..d2b02085915b3bff1f93252fbae65e2353ebd1a5 100644 (file)
@@ -1 +1 @@
-* { margin: 5px }
+* { margin: 5px }
index 975401f562b91746a4efde102e2831f5e2e0c81b..d928f5c4d1f1b6ba728cb3e1b22d4caa83e40026 100644 (file)
@@ -1 +1 @@
-* { margin: 5px 10px }
+* { margin: 5px 10px; }
index a9c63a9daad0271fc115ae9491877937fa23bd34..849cc63795b5bd10eaf656e819d5c53e32efdba3 100644 (file)
@@ -1 +1 @@
-* { margin: 5px 10px 3px }
+* { margin: 5px 10px 3px; }
index 15a4776a316008ec147364c305eb6ca4a7848f67..0f7b7f00d7024688e68693e6c45ea0746cce280d 100644 (file)
@@ -1 +1 @@
-* { margin: 5px 10px 3px 5px }
+* { margin: 5px 10px 3px 5px; }
index f03feac39b47ca273dd7532204ed2569d7fb48de..f9f4143b8ba8d199a7913e62e00f7514ad62bd9c 100644 (file)
@@ -1 +1 @@
-* { padding: 5px }
+* { padding: 5px; }
index 5e84be0790a5582fd56abd92a5f476fdadd40615..2a427b220f22073966e9a82ab6741cf663d80065 100644 (file)
@@ -1 +1 @@
-* { padding: 5px 10px }
+* { padding: 5px 10px; }
index fe8a64e8196142c5b43dc745ff180fe27ed08caf..6af4bc59b2ce31a822ee0b20cb56febfc85d06d5 100644 (file)
@@ -1 +1 @@
-* { border-width: 5em; border-radius: 10ex }
+* { border-width: 5em; border-radius: 10ex; }
index a08963ddda2d5f5b7f8f4a62f722b378832b09ed..09a202167b571f9bd17db3216f58f79c8b5a97f0 100644 (file)
@@ -1 +1 @@
-* { border-color: #ff00ff }
+* { border-color: #ff00ff; }
index d75aa584066a9dee51b30e2f8dad9ef18c190c30..f4074c7ac0869383767fe4de886ebf7e0cae130c 100644 (file)
@@ -1 +1 @@
-* { font: 10pt definitelydoesnotexist }
+* { font: 10pt definitelydoesnotexist; }
index dff250639ce26d43868f30b534e99ff7f532296a..c84459347fa219464dd4eabb261e9319c4f71f2a 100644 (file)
@@ -1 +1 @@
-* { border-image: url("./test.png") 3 4 3 4 stretch       }
+* { border-image: url("./test.png") 3 4 3 4 stretch   ;   }
index 1cbeeb97cfaefb71ed7df934a65740404cf038f8..34417ae2ae0d4ad9200b9263adedbe49a8b094cc 100644 (file)
@@ -1 +1 @@
-* { border-image: url("./test.png") 3 4 3 4 repeat stretch}
+* { border-image: url("./test.png") 3 4 3 4 repeat stretch;}
index cb1794aee8905650a59689cbb36c19e5d6ee8c7e..cf054e9723395fffd7bfa39727d1a7778e0be119 100644 (file)
@@ -1 +1 @@
-* { transition: 150ms ease-in-out                          }
+* { transition: 150ms ease-in-out                          ;}
index 957cc6327edd437aca4ca1512811549659aafe26..333d91425c6c8412774ab6e054e71a5dcb40f4bd 100644 (file)
@@ -1 +1 @@
-* { transition: 1s linear loop                             }
+* { transition: 1s linear loop;                             }
index e49c23a35b62c8713ef95d22060006a6bf1ff7e0..c6d867a70d34efe960139ac0edd9d6df65e12913 100644 (file)
@@ -1 +1 @@
-* { color: red; background-color: transparent }
+* { color: red; background-color: transparent; }
index d80ddf9cc895636bbfeb69a3f76261c7bd7193c3..b69fb9ab9b91bd6ff2dd0235059c062ca6f6f387 100644 (file)
@@ -1,14 +1,26 @@
-declarations.css:24: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:28: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:36: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:40: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:44: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:48: error: GTK_CSS_PARSER_ERROR_SYNTAX
-declarations.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:1:5-6: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:1:6-7: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:1:7-8: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:8:5-6: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:12:3-4: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:13:3-4: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:14:3-4: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:19:3-20:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:22:5-22: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:24:16-17: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:24:5-16: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:26:15-16: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:28:17-18: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:28:5-17: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:30:18-19: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:30:5-18: error: GTK_CSS_PARSER_WARNING_SYNTAX
+declarations.css:32:17-18: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:34:16-17: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:36:17-18: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:38:16-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:40:15-16: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:42:17-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:44:18-29: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:46:17-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:48:16-17: error: GTK_CSS_PARSER_ERROR_SYNTAX
+declarations.css:50:17-18: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 0fb86c365db183f98179a76a38101222490434e7..08ba7600eb0bc1588b73693095d6785d663e6ba3 100644 (file)
@@ -1 +1 @@
-does-not-exist.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+does-not-exist.css:2:3-17: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
index 4e237ca5309c7bda12510dbc312f0404e3f7ee1e..c5fcc9a8107bc5f8653942b2ccb03dd0de1ff6ec 100644 (file)
@@ -1 +1 @@
-freed-string-in-error-messages.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+freed-string-in-error-messages.css:2:23-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
index eaa1731dda2f6c09c300df64822ae89658bcb12a..31e7a5b1442ef68f33a270aa5665a7a7693a769b 100644 (file)
@@ -1,5 +1,5 @@
 @import url("import-cyclic-2.css");
 
 a {
-  padding-top: 1px
+  padding-top: 1px;
 }
index b88d31671e5f05bb99cb185cf320116fbdb89076..4a5f739ee6d5456226d8fe59027969ed75d0b743 100644 (file)
@@ -1 +1 @@
-import-cyclic-3.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT
+import-cyclic-3.css:1:1-36: error: GTK_CSS_PARSER_ERROR_IMPORT
index 9e5b89c712c86e61732d04f2f1c400acf5c5972c..1841df2bdb8b354d974732e42430ecd67edca51a 100644 (file)
@@ -1,5 +1,5 @@
 @import url("import-cyclic-3.css");
 
 a {
-  padding-top: 2px
+  padding-top: 2px;
 }
index bf7fecbe91627e603b981fac1c8a0361be6c1501..1ff1a9b42882c80f1bc80c5b78093008b16c820d 100644 (file)
@@ -1 +1 @@
-import-cyclic-1.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT
+import-cyclic-1.css:1:1-36: error: GTK_CSS_PARSER_ERROR_IMPORT
index 7ada04c6d299bf4ee46e8d41b62dfbfa9e6f5ed9..da93af9bcbf95ba7f2764248aa4c9e3c710fccc2 100644 (file)
@@ -1,5 +1,5 @@
 @import url("import-cyclic-1.css");
 
 a {
-  padding-top: 3px
+  padding-top: 3px;
 }
index 154684e14ae338e20722f8e3640f64380e1a30f0..d5e9e51e43ee3938dc8d0f5ad5bf9e4fd1e8ea3f 100644 (file)
@@ -1 +1 @@
-import-cyclic-2.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT
+import-cyclic-2.css:1:1-36: error: GTK_CSS_PARSER_ERROR_IMPORT
index db91da39d44d18b44a86f14a8537581246ccfd5f..76e5fae4f7cb8145fa8e253767f44c3c3eeb72f0 100644 (file)
@@ -1 +1 @@
-import-nonexistant.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT
+import-nonexistant.css:1:1-93: error: GTK_CSS_PARSER_ERROR_IMPORT
index 4999ccc5a666797a6f7bffcc61365b1fa0da187e..add4293752f725a3eee931ef4fac3be9f44fb791 100644 (file)
@@ -1 +1,2 @@
-import-recursive.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT
+import-recursive.css:1:1-37: error: GTK_CSS_PARSER_ERROR_IMPORT
+import-recursive.css:4:3-5:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
index 9451633efd5ae9f40739c4e8ecea38022c775d5f..bedebff64e9605533198ad6cf04dfea350076ef5 100644 (file)
@@ -101,6 +101,9 @@ test_data = [
   'at-invalid-21.css',
   'at-invalid-21.errors',
   'at-invalid-21.ref.css',
+  'at-invalid-22.css',
+  'at-invalid-22.errors',
+  'at-invalid-22.ref.css',
   'at-valid-01.css',
   'at-valid-01.ref.css',
   'at-valid-02.css',
@@ -247,6 +250,7 @@ test_data = [
   'declarations-valid-01.css',
   'declarations-valid-01.ref.css',
   'declarations-valid-02.css',
+  'declarations-valid-02.errors',
   'declarations-valid-02.ref.css',
   'declarations-valid-03.css',
   'declarations-valid-03.ref.css',
@@ -344,6 +348,7 @@ test_data = [
   'min-width.css',
   'min-width.ref.css',
   'no-semicolon.css',
+  'no-semicolon.errors',
   'no-semicolon.ref.css',
   'not.css',
   'not.ref.css',
diff --git a/testsuite/css/parser/no-semicolon.errors b/testsuite/css/parser/no-semicolon.errors
new file mode 100644 (file)
index 0000000..0362acc
--- /dev/null
@@ -0,0 +1,2 @@
+no-semicolon.css:2:3-3:1: error: GTK_CSS_PARSER_WARNING_SYNTAX
+no-semicolon.css:4:7-25: error: GTK_CSS_PARSER_WARNING_SYNTAX
index 7860a3b3db8f5701999a4b4c03dabc1e0944502b..1c68b541a643b71a6b7bed20982d73505f5827be 100644 (file)
-a:nth-last-child( odd  ) { color: red }
-a:nth-child(even   ) { color: red }
-b:nth-child(   /**/n) { color: red }
+a:nth-last-child( odd  ) { color: red; }
+a:nth-child(even   ) { color: red; }
+b:nth-child(   /**/n) { color: red; }
 c:nth-child(/**/    n  +
-0) { color: red }
-d:nth-child(   n +  1) { color: red }
-e:nth-child(    /**/n+ 2) { color: red }
-f:nth-last-child(              n+      10) { color: red }
+0) { color: red; }
+d:nth-child(   n +  1) { color: red; }
+e:nth-child(    /**/n+ 2) { color: red; }
+f:nth-last-child(              n+      10) { color: red; }
 g:nth-child(
 
 
-n) { color: red }
+n) { color: red; }
 h:nth-child(/**/       n
--  0) { color: red }
+-  0) { color: red; }
 i:nth-child(
-/**/ n  -1) { color: red }
-j:nth-child(/**/  /**/n - 2) { color: red }
+/**/ n  -1) { color: red; }
+j:nth-child(/**/  /**/n - 2) { color: red; }
 k:nth-last-child(       n  -
-10) { color: red }
-l:nth-last-child( /**/0) { color: red }
+10) { color: red; }
+l:nth-last-child( /**/0) { color: red; }
 m:nth-child(
- 0n) { color: red }
+ 0n) { color: red; }
 n:nth-last-child( /**/0/**/n
 +
-0) { color: red }
-o:nth-last-child(   0 n  +     1) { color: red }
-p:nth-last-child(      0n+/**/2) { color: red }
+0) { color: red; }
+o:nth-last-child(   0 n  +     1) { color: red; }
+p:nth-last-child(      0n+/**/2) { color: red; }
 q:nth-last-child(
- 0     n  +    10) { color: red }
+ 0     n  +    10) { color: red; }
 r:nth-child(  0
-n) { color: red }
+n) { color: red; }
 s:nth-child(
-       0 n  -/**/0) { color: red }
+       0 n  -/**/0) { color: red; }
 t:nth-last-child(  
 0
 n
--      1) { color: red }
-u:nth-last-child(   0  n  -/**/2) { color: red }
-v:nth-last-child( 0n  -10) { color: red }
-w:nth-last-child(  1) { color: red }
+-      1) { color: red; }
+u:nth-last-child(   0  n  -/**/2) { color: red; }
+v:nth-last-child( 0n  -10) { color: red; }
+w:nth-last-child(  1) { color: red; }
 x:nth-child( 
-1n) { color: red }
+1n) { color: red; }
 y:nth-child(/**//**/1  n +
-0) { color: red }
+0) { color: red; }
 z:nth-child(
 1
 n +
-1) { color: red }
+1) { color: red; }
 ab:nth-child(
- 1 n   +2) { color: red }
+ 1 n   +2) { color: red; }
 bb:nth-last-child(     1n  +
-10) { color: red }
-cb:nth-last-child(1/**/n) { color: red }
-db:nth-last-child(      1  n   -0) { color: red }
+10) { color: red; }
+cb:nth-last-child(1/**/n) { color: red; }
+db:nth-last-child(      1  n   -0) { color: red; }
 eb:nth-child( 1 n-
-1) { color: red }
+1) { color: red; }
 fb:nth-child(/**/
 1  n-
-2) { color: red }
-gb:nth-child(          1n  -10) { color: red }
-hb:nth-last-child(/**/  2) { color: red }
-ib:nth-child( 2 n) { color: red }
+2) { color: red; }
+gb:nth-child(          1n  -10) { color: red; }
+hb:nth-last-child(/**/  2) { color: red; }
+ib:nth-child( 2 n) { color: red; }
 jb:nth-last-child(   2 n +
-0) { color: red }
-kb:nth-child(/**/      2n+     1) { color: red }
+0) { color: red; }
+kb:nth-child(/**/      2n+     1) { color: red; }
 lb:nth-child(/**//**/2/**/n
-+  2) { color: red }
++  2) { color: red; }
 mb:nth-last-child(
 2
 n  +
-10) { color: red }
+10) { color: red; }
 nb:nth-last-child(  
-2n) { color: red }
+2n) { color: red; }
 ob:nth-child( 
-2      n  -    0) { color: red }
+2      n  -    0) { color: red; }
 pb:nth-last-child(
- 2n/**/-/**/1) { color: red }
-qb:nth-child( /**/2    n - 2) { color: red }
+ 2n/**/-/**/1) { color: red; }
+qb:nth-child( /**/2    n - 2) { color: red; }
 rb:nth-last-child(
-       2/**/n -        10) { color: red }
-sb:nth-child(    10) { color: red }
+       2/**/n -        10) { color: red; }
+sb:nth-child(    10) { color: red; }
 tb:nth-last-child(
-       10n) { color: red }
+       10n) { color: red; }
 ub:nth-last-child(
-  10/**/n/**/+  0) { color: red }
+  10/**/n/**/+  0) { color: red; }
 vb:nth-child(  10
-n+/**/1) { color: red }
+n+/**/1) { color: red; }
 wb:nth-last-child(     10 n  +
-2) { color: red }
-xb:nth-child(   10/**/n  +  10) { color: red }
+2) { color: red; }
+xb:nth-child(   10/**/n  +  10) { color: red; }
 yb:nth-last-child(       10
-n) { color: red }
+n) { color: red; }
 zb:nth-last-child( 10  n
--0) { color: red }
+-0) { color: red; }
 ac:nth-last-child(10n/**/-
-1) { color: red }
+1) { color: red; }
 bc:nth-child(  10 n
--/**/2) { color: red }
+-/**/2) { color: red; }
 cc:nth-child(
 /**/10 n
--  10) { color: red }
-dc:nth-child( even     ) { color: red }
+-  10) { color: red; }
+dc:nth-child( even     ) { color: red; }
 ec:nth-last-child(
 +
-/**/n) { color: red }
+/**/n) { color: red; }
 fc:nth-child(  +   n+
-0) { color: red }
+0) { color: red; }
 gc:nth-child(/**/+
 
-n  +   1) { color: red }
-hc:nth-last-child(/**/+ n      +/**/2) { color: red }
+n  +   1) { color: red; }
+hc:nth-last-child(/**/+ n      +/**/2) { color: red; }
 ic:nth-last-child(  +  
-n      +10) { color: red }
-jc:nth-last-child( +   n) { color: red }
-kc:nth-last-child( +/**/  n    - 0) { color: red }
-lc:nth-last-child( +n  -       1) { color: red }
+n      +10) { color: red; }
+jc:nth-last-child( +   n) { color: red; }
+kc:nth-last-child( +/**/  n    - 0) { color: red; }
+lc:nth-last-child( +n  -       1) { color: red; }
 mc:nth-child(
-+        n-2) { color: red }
-nc:nth-last-child(+  n -10) { color: red }
++        n-2) { color: red; }
+nc:nth-last-child(+  n -10) { color: red; }
 oc:nth-child(
-+  0) { color: red }
-pc:nth-child(  +0      n) { color: red }
++  0) { color: red; }
+pc:nth-child(  +0      n) { color: red; }
 qc:nth-last-child(     +/**/0/**/n
 +
-0) { color: red }
-rc:nth-last-child(/**/+        0  n +  1) { color: red }
+0) { color: red; }
+rc:nth-last-child(/**/+        0  n +  1) { color: red; }
 sc:nth-last-child(
-+0  n/**/+2) { color: red }
++0  n/**/+2) { color: red; }
 tc:nth-child(  +       0
-n+     10) { color: red }
+n+     10) { color: red; }
 uc:nth-child(
 + 0
-n) { color: red }
+n) { color: red; }
 vc:nth-last-child(
 +      0n
 -
-0) { color: red }
-wc:nth-last-child(/**/+/**/0n  -       1) { color: red }
+0) { color: red; }
+wc:nth-last-child(/**/+/**/0n  -       1) { color: red; }
 xc:nth-child(  +
-0n     -  2) { color: red }
+0n     -  2) { color: red; }
 yc:nth-last-child(
-+  0/**/n      -/**/10) { color: red }
++  0/**/n      -/**/10) { color: red; }
 zc:nth-child(+
-1) { color: red }
+1) { color: red; }
 ad:nth-child(/**/+     1
-n) { color: red }
+n) { color: red; }
 bd:nth-last-child(+/**/1  n +
-0) { color: red }
+0) { color: red; }
 cd:nth-child(/**/+/**/1
 n      +
-1) { color: red }
+1) { color: red; }
 dd:nth-child(/**/+
-1      n  +2) { color: red }
+1      n  +2) { color: red; }
 ed:nth-child(
 +  1n +
-10) { color: red }
-fd:nth-child(  +  1 n) { color: red }
+10) { color: red; }
+fd:nth-child(  +  1 n) { color: red; }
 gd:nth-child(  +  1
-n  -0) { color: red }
-hd:nth-child(+  1n-  1) { color: red }
-id:nth-child(  +       1 n-    2) { color: red }
-jd:nth-last-child( +/**/1n  -/**/10) { color: red }
-kd:nth-last-child(  + 2) { color: red }
-ld:nth-child(/**/+     2n) { color: red }
-md:nth-last-child(  +  2 n/**/+/**/0) { color: red }
+n  -0) { color: red; }
+hd:nth-child(+  1n-  1) { color: red; }
+id:nth-child(  +       1 n-    2) { color: red; }
+jd:nth-last-child( +/**/1n  -/**/10) { color: red; }
+kd:nth-last-child(  + 2) { color: red; }
+ld:nth-child(/**/+     2n) { color: red; }
+md:nth-last-child(  +  2 n/**/+/**/0) { color: red; }
 nd:nth-child(/**/+     2
-n      +       1) { color: red }
+n      +       1) { color: red; }
 od:nth-child(  +  2  n +
-2) { color: red }
+2) { color: red; }
 pd:nth-last-child(
-+ 2/**/n  +/**/10) { color: red }
-qd:nth-last-child(+/**/2/**/n) { color: red }
-rd:nth-child(+  2  n/**/-0) { color: red }
++ 2/**/n  +/**/10) { color: red; }
+qd:nth-last-child(+/**/2/**/n) { color: red; }
+rd:nth-child(+  2  n/**/-0) { color: red; }
 sd:nth-child( +  2
-n -    1) { color: red }
+n -    1) { color: red; }
 td:nth-last-child(     +2
 n
--      2) { color: red }
+-      2) { color: red; }
 ud:nth-last-child( +  2
-n      -  10) { color: red }
-vd:nth-last-child(+  10) { color: red }
-wd:nth-child(  +10n) { color: red }
+n      -  10) { color: red; }
+vd:nth-last-child(+  10) { color: red; }
+wd:nth-child(  +10n) { color: red; }
 xd:nth-last-child(/**/+
 10
-n      +  0) { color: red }
-yd:nth-last-child(/**/+  10    n       +/**/1) { color: red }
-zd:nth-last-child(  + 10  n+   2) { color: red }
+n      +  0) { color: red; }
+yd:nth-last-child(/**/+  10    n       +/**/1) { color: red; }
+zd:nth-last-child(  + 10  n+   2) { color: red; }
 ae:nth-last-child(
-+ 10 n +/**/10) { color: red }
-be:nth-last-child(     +       10/**/n) { color: red }
-ce:nth-last-child(     + 10/**/n-  0) { color: red }
++ 10 n +/**/10) { color: red; }
+be:nth-last-child(     +       10/**/n) { color: red; }
+ce:nth-last-child(     + 10/**/n-  0) { color: red; }
 de:nth-child(+10  n-
-1) { color: red }
-ee:nth-last-child( +/**/10     n/**/-2) { color: red }
+1) { color: red; }
+ee:nth-last-child( +/**/10     n/**/-2) { color: red; }
 fe:nth-last-child(  +
-10/**/n        -10) { color: red }
+10/**/n        -10) { color: red; }
 ge:nth-last-child(
-odd/**/) { color: red }
-he:nth-last-child(/**/-   n) { color: red }
+odd/**/) { color: red; }
+he:nth-last-child(/**/-   n) { color: red; }
 ie:nth-last-child(
 - 
 n      +
-0) { color: red }
-je:nth-child(-/**/     n +  1) { color: red }
-ke:nth-last-child(/**/- n      +2) { color: red }
+0) { color: red; }
+je:nth-child(-/**/     n +  1) { color: red; }
+ke:nth-last-child(/**/- n      +2) { color: red; }
 le:nth-last-child(/**/-        n
-+  10) { color: red }
++  10) { color: red; }
 me:nth-last-child(
--/**/ n) { color: red }
+-/**/ n) { color: red; }
 ne:nth-child(
 -      n
--  0) { color: red }
-oe:nth-last-child(-    /**/n-1) { color: red }
+-  0) { color: red; }
+oe:nth-last-child(-    /**/n-1) { color: red; }
 pe:nth-child(  - 
-n - 2) { color: red }
-qe:nth-last-child(/**/-/**//**/n/**/-  10) { color: red }
-re:nth-child(  -/**/0) { color: red }
+n - 2) { color: red; }
+qe:nth-last-child(/**/-/**//**/n/**/-  10) { color: red; }
+re:nth-child(  -/**/0) { color: red; }
 se:nth-last-child(/**/-
-0 n) { color: red }
+0 n) { color: red; }
 te:nth-child(
 -      0 n+
-0) { color: red }
+0) { color: red; }
 ue:nth-child(  -
-0/**/n+/**/1) { color: red }
+0/**/n+/**/1) { color: red; }
 ve:nth-last-child(
 -/**/0 n
-+      2) { color: red }
++      2) { color: red; }
 we:nth-last-child(
--0  n/**/+ 10) { color: red }
+-0  n/**/+ 10) { color: red; }
 xe:nth-last-child(-    0
-n) { color: red }
+n) { color: red; }
 ye:nth-last-child(     -0      n
--  0) { color: red }
-ze:nth-last-child( -   0 n -/**/1) { color: red }
-af:nth-last-child(  -0/**/n    - 2) { color: red }
+-  0) { color: red; }
+ze:nth-last-child( -   0 n -/**/1) { color: red; }
+af:nth-last-child(  -0/**/n    - 2) { color: red; }
 bf:nth-child( - 0n
--10) { color: red }
-cf:nth-child(  -  1) { color: red }
+-10) { color: red; }
+cf:nth-child(  -  1) { color: red; }
 df:nth-child( -        1
-n) { color: red }
-ef:nth-last-child(/**/-1 n+  0) { color: red }
+n) { color: red; }
+ef:nth-last-child(/**/-1 n+  0) { color: red; }
 ff:nth-child(
 -/**/1  n/**/+
-1) { color: red }
+1) { color: red; }
 gf:nth-last-child(-
-1 n  + 2) { color: red }
+1 n  + 2) { color: red; }
 hf:nth-last-child(     -
 1      n
 +
-10) { color: red }
+10) { color: red; }
 if:nth-child(
--  1  n) { color: red }
-jf:nth-last-child(-  1 n - 0) { color: red }
+-  1  n) { color: red; }
+jf:nth-last-child(-  1 n - 0) { color: red; }
 kf:nth-child(-  1  n -
-1) { color: red }
-lf:nth-child(  -  1/**/n -/**/2) { color: red }
+1) { color: red; }
+lf:nth-child(  -  1/**/n -/**/2) { color: red; }
 mf:nth-last-child(  -
-1/**/n  -/**/10) { color: red }
-nf:nth-last-child(/**/-/**/2) { color: red }
-of:nth-child( -  2/**/n) { color: red }
+1/**/n  -/**/10) { color: red; }
+nf:nth-last-child(/**/-/**/2) { color: red; }
+of:nth-child( -  2/**/n) { color: red; }
 pf:nth-child(
 - 2
-n +  0) { color: red }
-qf:nth-child(  -  2 n +/**/1) { color: red }
+n +  0) { color: red; }
+qf:nth-child(  -  2 n +/**/1) { color: red; }
 rf:nth-child(/**/-     2
 n  +
-2) { color: red }
+2) { color: red; }
 sf:nth-last-child(  -/**/2/**/n
-+  10) { color: red }
-tf:nth-child(  -2 n) { color: red }
-uf:nth-child(/**/- 2n  - 0) { color: red }
-vf:nth-last-child( -2 n-1) { color: red }
-wf:nth-last-child(-  2/**/n  -  2) { color: red }
++  10) { color: red; }
+tf:nth-child(  -2 n) { color: red; }
+uf:nth-child(/**/- 2n  - 0) { color: red; }
+vf:nth-last-child( -2 n-1) { color: red; }
+wf:nth-last-child(-  2/**/n  -  2) { color: red; }
 xf:nth-child(  -2
 n-
-10) { color: red }
+10) { color: red; }
 yf:nth-child(
--10) { color: red }
-zf:nth-child(  - 10/**/n) { color: red }
+-10) { color: red; }
+zf:nth-child(  - 10/**/n) { color: red; }
 ag:nth-child(
--  10 n+       0) { color: red }
+-  10 n+       0) { color: red; }
 bg:nth-last-child(
--/**/10n/**/+1) { color: red }
-cg:nth-child(  -/**/10 n       +2) { color: red }
+-/**/10n/**/+1) { color: red; }
+cg:nth-child(  -/**/10 n       +2) { color: red; }
 dg:nth-last-child(/**/-
-10  n  +  10) { color: red }
-eg:nth-last-child(/**/- 10 n) { color: red }
-fg:nth-last-child(- 10n        -  0) { color: red }
-gg:nth-last-child(  -10n       - 1) { color: red }
-hg:nth-child(/**/- 10  n       - 2) { color: red }
+10  n  +  10) { color: red; }
+eg:nth-last-child(/**/- 10 n) { color: red; }
+fg:nth-last-child(- 10n        -  0) { color: red; }
+gg:nth-last-child(  -10n       - 1) { color: red; }
+hg:nth-child(/**/- 10  n       - 2) { color: red; }
 ig:nth-child(/**/-
-10     n -10) { color: red }
+10     n -10) { color: red; }
index f4f3d0ce1cd92ee55b750b42074b994e5e9b8556..175d0e1972c4d5ec30cbbe63dbba5dcb807ecd7f 100644 (file)
@@ -1,2 +1,2 @@
-property-name-errors.css:2: error: GTK_CSS_PARSER_ERROR_UNKNWON_VALUE
-property-name-errors.css:3: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+property-name-errors.css:2:3-23: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+property-name-errors.css:3:3-28: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
index 47033c3933e738dc3a9daf1c04af8fdb9c2e4cd6..f675e59fb851a3c6f2be47a6e0987aaef0c2779f 100644 (file)
@@ -1,6 +1,6 @@
-pseudo-classes-unknown.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
-pseudo-classes-unknown.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
-pseudo-classes-unknown.css:9: error: GTK_CSS_PARSER_ERROR_SYNTAX
-pseudo-classes-unknown.css:13: error: GTK_CSS_PARSER_ERROR_SYNTAX
-pseudo-classes-unknown.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
-pseudo-classes-unknown.css:21: error: GTK_CSS_PARSER_ERROR_SYNTAX
+pseudo-classes-unknown.css:1:1-17: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+pseudo-classes-unknown.css:5:1-18: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+pseudo-classes-unknown.css:9:1-3: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+pseudo-classes-unknown.css:13:1-11: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
+pseudo-classes-unknown.css:17:12-13: error: GTK_CSS_PARSER_ERROR_SYNTAX
+pseudo-classes-unknown.css:21:4-48: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
index ee197a9fa9b313e2030a0db464ee99962269c338..c3abce525508f8fdf05883a615c7170bee4c3125 100644 (file)
@@ -1 +1 @@
-radial-background-position-error.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
+radial-background-position-error.css:2:34-38: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 85ca87bdf2ffa1d8908765d1fecdf2f05b90df83..6ddd7fb4af1a2aec0a5add18ff370edc089bd7c4 100644 (file)
@@ -1,3 +1,3 @@
-radial-positions.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
-radial-positions.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
-radial-positions.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX
+radial-positions.css:2:45-51: error: GTK_CSS_PARSER_ERROR_SYNTAX
+radial-positions.css:5:50-56: error: GTK_CSS_PARSER_ERROR_SYNTAX
+radial-positions.css:8:50-56: error: GTK_CSS_PARSER_ERROR_SYNTAX
index e282b22a467671a96b1ae172e8f74c2b2b8306ef..3de2f4e8b47823dc7a299d2c5a9faff9b145cfaf 100644 (file)
@@ -1 +1 @@
-single-slash.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
+single-slash.css:1:1-2: error: GTK_CSS_PARSER_ERROR_SYNTAX
index 6e9f3efc316b2f21f2e3926af5820ca7c85f1f3c..eb909583f71b02d6665fc12d9259027a52fe85fc 100644 (file)
@@ -142,16 +142,14 @@ parsing_error_cb (GtkCssProvider *provider,
                   const GError   *error,
                   GString        *errors)
 {
-  const GtkCssLocation *end_location;
-  char *basename;
+  char *section_string;
 
-  end_location = gtk_css_section_get_end_location (section);
+  section_string = gtk_css_section_to_string (section);
 
-  basename = g_file_get_basename (gtk_css_section_get_file (section));
   g_string_append_printf (errors,
-                          "%s:%zu: error: ",
-                          basename, end_location->lines + 1);
-  g_free (basename);
+                          "%s: error: ",
+                          section_string);
+  g_free (section_string);
 
   if (error->domain == GTK_CSS_PARSER_ERROR)
     append_error_value (errors, GTK_TYPE_CSS_PARSER_ERROR, error->code);
index 31bef5177e500a72cd1d4a747096f41f577cb9e9..5635b5440afafcc15726f1d3abb5a70ec582a3ec 100644 (file)
@@ -1,2 +1,2 @@
-text-shadow-invalid-but-worked-in-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
-text-shadow-invalid-but-worked-in-3.12.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
+text-shadow-invalid-but-worked-in-3.12.css:2:16-21: error: GTK_CSS_PARSER_ERROR_SYNTAX
+text-shadow-invalid-but-worked-in-3.12.css:6:22-23: error: GTK_CSS_PARSER_ERROR_SYNTAX
index ac4d99a4688c5211a2d895eea2a5fbfa33b57055..7ea150f1f59d892fae74229eb209c55e885bbe47 100644 (file)
@@ -1,31 +1,31 @@
-value-none.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:7: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:9: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:12: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:13: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:16: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:19: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:20: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:23: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:24: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:25: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:27: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:29: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:31: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:35: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:36: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:37: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:39: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:40: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:41: error: GTK_CSS_PARSER_ERROR_SYNTAX
-value-none.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:3:20-24: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:4:21-25: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:6:22-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:7:22-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:8:24-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:9:30-34: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:10:31-35: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:12:24-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:13:24-28: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:14:23-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:16:23-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:17:22-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:19:22-26: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:20:23-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:22:23-27: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:23:21-25: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:24:27-31: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:25:28-32: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:27:21-25: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:29:10-14: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:31:14-18: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:32:15-19: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:34:16-20: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:35:18-22: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:36:16-20: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:37:17-21: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:38:15-19: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:39:19-23: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:40:17-21: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:41:18-22: error: GTK_CSS_PARSER_ERROR_SYNTAX
+value-none.css:42:16-20: error: GTK_CSS_PARSER_ERROR_SYNTAX